From 7442b3144dc17a3107d7038620dc626faa16cb1b Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Sat, 8 Apr 2017 22:35:45 -0500 Subject: [PATCH] Use https in KML writer, esp. for geocaching and tracks. Geocaching 'Other' tab: * Reduce number of redirects to Google Maps. * Drop StreetView. It can be reached from Maps. * RIP Yahoo Maps, Microsoft Research Maps (nee Terraserver) reference*: regenerate reference files. --- kml.cc | 27 +++-- reference/LineStyles.kml | 8 +- reference/bounds-test.kml | 8 +- reference/earth-expertgps-track.kml | 16 +-- reference/earth-expertgps.kml | 12 +-- reference/earth-gc.kml | 100 ++++++++---------- reference/track/bounds-test-track.kml | 8 +- .../track/gpx_garmin_extensions-kml_track.kml | 12 +-- reference/track/gtrnctr_power-kml.kml | 12 +-- reference/track/segmented_tracks-track.kml | 12 +-- reference/track/segmented_tracks.kml | 8 +- reference/track/tracks~gpx.kml | 76 ++++++------- testo.d/geojson.test | 5 +- 13 files changed, 146 insertions(+), 158 deletions(-) diff --git a/kml.cc b/kml.cc index 519488d45..d55110c47 100644 --- a/kml.cc +++ b/kml.cc @@ -96,7 +96,7 @@ static gpsbabel::DateTime kml_time_max; #define DEFAULT_PRECISION "6" // Icons provided and hosted by Google. Used with permission. -#define ICON_BASE "http://earth.google.com/images/kml-icons/" +#define ICON_BASE "https://earth.google.com/images/kml-icons/" // Multitrack ids to correlate Schema to SchemaData static const char kmt_heartrate[] = "heartrate"; @@ -193,7 +193,7 @@ struct { }; #define ICON_NOSAT ICON_BASE "youarehere-warning.png"; -#define ICON_WPT "http://maps.google.com/mapfiles/kml/pal4/icon61.png" +#define ICON_WPT "https://maps.google.com/mapfiles/kml/pal4/icon61.png" #define ICON_TRK ICON_BASE "track-directional/track-none.png" #define ICON_RTE ICON_BASE "track-directional/track-none.png" #define ICON_MULTI_TRK ICON_BASE "track-directional/track-0.png" @@ -1132,24 +1132,21 @@ void kml_gc_all_tabs_text(QString& cdataStr) { // cdataStr.append(" \n"); cdataStr.append("\n"); - cdataStr.append("$[gc_num] $[gc_name] \n"); - cdataStr.append("a $[gc_type],
on $[gc_placed] by $[gc_placer]
\n"); - cdataStr.append("Difficulty: \"$[gc_diff]\"\n"); - cdataStr.append(" Terrain: \"$[gc_terr]\"
\n"); - cdataStr.append("Size: \"$[gc_cont_icon]\"/ ($[gc_cont_icon])
\n"); + cdataStr.append("$[gc_num] $[gc_name] \n"); + cdataStr.append("a $[gc_type],
on $[gc_placed] by $[gc_placer]
\n"); + cdataStr.append("Difficulty: \"$[gc_diff]\"\n"); + cdataStr.append(" Terrain: \"$[gc_terr]\"
\n"); + cdataStr.append("Size: \"$[gc_cont_icon]\"/ ($[gc_cont_icon])
\n"); } static const QString map_templates[] = { - "Google Maps", - "Google Street View", + "Google Maps", "Geocaching.com Google Map", "MyTopo Maps", "MapQuest", "Bing Maps", - "Yahoo Maps", "Rand McNally", - "MSR Maps (Formerly Terraserver)", "Open Cycle Maps", "Open Street Maps", NULL @@ -1168,9 +1165,9 @@ void kml_gc_make_balloonstyletext(void) cdataStr.append("\n"); cdataStr.append("\n"); cdataStr.append("\n"); - cdataStr.append("\n"); - cdataStr.append("\n"); - cdataStr.append("\n"); + cdataStr.append("\n"); + cdataStr.append("\n"); + cdataStr.append("\n"); cdataStr.append(" - + + + - + + +